Skip to content

USHIFT-7346: C2CC upstream user documentation - #7015

Merged
openshift-merge-bot[bot] merged 7 commits into
openshift:mainfrom
pmtk:c2cc-user-doc
Jul 14, 2026
Merged

USHIFT-7346: C2CC upstream user documentation#7015
openshift-merge-bot[bot] merged 7 commits into
openshift:mainfrom
pmtk:c2cc-user-doc

Conversation

@pmtk

@pmtk pmtk commented Jul 8, 2026

Copy link
Copy Markdown
Member

Summary by CodeRabbit

  • Documentation
    • Added a new how-to guide for Cluster-to-Cluster Connectivity (C2CC), including multi-cluster setup, remote health/latency verification, cross-cluster DNS behavior, cleanup steps, and operational considerations.
    • Expanded the C2CC with IPsec companion guide with concrete ipsec/XFRM verification examples, tighter traffic-capture expectations, and stronger nftables enforcement guidance with persistence and MTU sizing (including jumbo-frame scenarios).
    • Updated the user documentation index to link both new C2CC guides.

@openshift-ci-robot

openshift-ci-robot commented Jul 8, 2026

Copy link
Copy Markdown

@pmtk: This pull request references USHIFT-7346 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the task to target the "5.0.0" version, but no target version was set.

Details

In response to this:

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Jul 8, 2026
@coderabbitai

coderabbitai Bot commented Jul 8, 2026

Copy link
Copy Markdown
Contributor

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Repository YAML (base), Central YAML (inherited)

Review profile: CHILL

Plan: Enterprise

Run ID: 3bfbb537-4a3f-46ba-81f2-f5592b8640e6

📥 Commits

Reviewing files that changed from the base of the PR and between 77512f1 and b5413c4.

📒 Files selected for processing (1)
  • docs/user/howto_c2cc.md
🚧 Files skipped from review as they are similar to previous changes (1)
  • docs/user/howto_c2cc.md

Walkthrough

This PR adds C2CC user documentation, links it from the documentation index, and expands IPsec guidance with tunnel verification, nftables enforcement, MTU considerations, and forwarded-traffic enforcement configuration.

Changes

C2CC and IPsec documentation

Layer / File(s) Summary
C2CC overview and prerequisites
docs/user/README.md, docs/user/howto_c2cc.md
Introduces C2CC capabilities, host-side mechanisms, prerequisites, and configuration constraints.
C2CC setup and verification
docs/user/howto_c2cc.md
Documents multi-cluster configuration, firewall and restart requirements, health checks, routing inspection, SNAT-bypass validation, and connectivity testing.
C2CC DNS and operations
docs/user/howto_c2cc.md
Adds DNS behavior, configuration references, IP family requirements, cleanup steps, and operational considerations.
IPsec verification and enforcement
docs/user/howto_c2cc_ipsec.md, test/resources/ipsec.resource
Expands tunnel verification, adds nftables enforcement guidance, updates MTU and security notes, and changes enforcement to the forwarded traffic path.

Estimated code review effort: 2 (Simple) | ~10 minutes

Suggested reviewers: jerpeter1

🚥 Pre-merge checks | ✅ 15
✅ Passed checks (15 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title accurately summarizes the main change: added upstream user documentation for C2CC.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
Stable And Deterministic Test Names ✅ Passed No Ginkgo test titles were added; the PR only changes docs and a Robot Framework resource with static keyword names.
Test Structure And Quality ✅ Passed PASS: The PR only updates docs and a test resource; no Ginkgo test code, setup/teardown, or assertions were changed, so the check is not applicable.
Microshift Test Compatibility ✅ Passed No new Ginkgo e2e tests were added; the changed test files are Robot resources/suites, so MicroShift API compatibility rules don’t apply.
Single Node Openshift (Sno) Test Compatibility ✅ Passed No new Ginkgo e2e tests were added; the commit only changes docs, and the changed resource file is Robot Framework, not SNO-sensitive Ginkgo code.
Topology-Aware Scheduling Compatibility ✅ Passed Only docs/user/howto_c2cc.md changed; no deployment manifests, operator code, or controllers were modified, so topology-aware scheduling checks are not applicable.
Ote Binary Stdout Contract ✅ Passed The PR diff is docs-only; no main/init/TestMain/suite setup or stdout logging was added, so the OTE stdout contract isn’t impacted.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed Only docs/user/howto_c2cc.md changed in HEAD; no .go or Ginkgo e2e tests were added, so IPv4/disconnected-network test checks don’t apply.
No-Weak-Crypto ✅ Passed No MD5/SHA1/DES/RC4/3DES/Blowfish/ECB, custom crypto, or secret comparisons found; IPsec examples use AES-256/SHA-256 only.
Container-Privileges ✅ Passed Only docs/user/howto_c2cc.md changed; no K8s/container manifests or privilege fields were present in the diff.
No-Sensitive-Data-In-Logs ✅ Passed Only generic examples/placeholders appear; no real passwords, tokens, PII, or internal/customer data were introduced in the docs or test resource.
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Comment @coderabbitai help to get the list of available commands.

@openshift-ci
openshift-ci Bot requested review from ggiguash and jerpeter1 July 8, 2026 17:45
@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 8, 2026

@coderabbitai coderabbitai Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 4

🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

Inline comments:
In `@docs/user/howto_c2cc_ipsec.md`:
- Line 221: The MTU guidance in the C2CC IPsec documentation is missing the
reboot requirement, which makes the example misleading. Update the text around
the MicroShift MTU example to state that changing `/etc/microshift/ovn.yaml` for
`mtu` requires a node reboot to take effect, and adjust the instructions near
the IPsec overhead and `mtu: 8900` example so they no longer imply that
restarting MicroShift alone is sufficient.
- Around line 194-202: The CIDR enforcement example in the IPsec how-to uses the
wrong nftables hook; update the rules in the c2cc_ipsec example to use the
forward path instead of input so routed pod/service traffic is actually
filtered. Keep the existing table and chain setup, but adjust the chain
definition and accompanying rule examples in the section around the Host A/Host
B CIDRs so the `enforce` chain is bound to the forwarding hook.

In `@docs/user/howto_c2cc.md`:
- Around line 423-429: The IPsec recommendation in the c2c documentation is too
broad and implies protection is always enforced, even though the Libreswan setup
can stop protecting CIDRs if the service is stopped or a connection definition
is removed. Update the text in the c2cc how-to section to tie the recommendation
to the enforced setup by referencing the IPsec guide’s shunt/connection
requirements and making it clear that IPsec only provides the intended
protection when that enforced configuration remains in place. Use the existing
“howto_c2cc” and “howto_c2cc_ipsec” guidance sections as the anchor points for
the wording.
- Around line 314-316: The fenced block showing
<service>.<namespace>.svc.<domain> is missing a language tag, causing the
markdown lint failure. Update that fenced code block in the howto content to use
a typed fence such as text so it matches the expected markdown style and
resolves MD040.
🪄 Autofix (Beta)

Fix all unresolved CodeRabbit comments on this PR:

  • Push a commit to this branch (recommended)
  • Create a new PR with the fixes

ℹ️ Review info
⚙️ Run configuration

Configuration used: Repository YAML (base), Central YAML (inherited)

Review profile: CHILL

Plan: Enterprise

Run ID: 97446b08-c708-4412-91ad-0d37a1b3de70

📥 Commits

Reviewing files that changed from the base of the PR and between 89260da and 4754772.

📒 Files selected for processing (3)
  • docs/user/README.md
  • docs/user/howto_c2cc.md
  • docs/user/howto_c2cc_ipsec.md

Comment thread docs/user/howto_c2cc_ipsec.md
Comment thread docs/user/howto_c2cc_ipsec.md Outdated
Comment thread docs/user/howto_c2cc.md Outdated
Comment thread docs/user/howto_c2cc.md Outdated
@coderabbitai coderabbitai Bot added the ready-for-human-review Indicates a PR has been reviewed by automated tools and is ready for human review label Jul 9, 2026
Comment thread docs/user/howto_c2cc.md Outdated
Pod-to-Service communication between independent MicroShift clusters.
It targets edge deployments where multiple single-node MicroShift instances
on the same network segment (or reachable via routable next-hops) need to
consume each other's workloads without an external interconnect solution.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

External? Do you mean 3rd party?

Comment thread docs/user/howto_c2cc.md
Comment thread docs/user/howto_c2cc.md Outdated

### Configure the firewall

MicroShift intentionally does not manage firewall rules for C2CC — edge

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For c2cc and in general - firewall rules are not managed by MicroShift.
Let's update this not to make c2cc sound "special"

Comment thread docs/user/howto_c2cc.md
Comment thread docs/user/howto_c2cc.md
@pmtk

pmtk commented Jul 14, 2026

Copy link
Copy Markdown
Member Author

/test ?

@pmtk

pmtk commented Jul 14, 2026

Copy link
Copy Markdown
Member Author

/test e2e-aws-tests-bootc-c2cc

Comment thread docs/user/howto_c2cc.md Outdated
### Restart MicroShift

```bash
sudo systemctl restart microshift

@agullon agullon Jul 14, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

On cluster B I had to run sudo microshift cleanup-data --all before restart command because:

  Jul 14 10:17:35 el98-src-c2cc-rpm-bootc-host2 microshift[26646]: ??? E0714 10:17:35.714081   26646 run.go:72] "command failed" err="invalid configuration: error validating clusterToCluster: remote CIDR \"10.42.0.0/16\" contains host interface IP 10.42.0.2 — this would disrupt management traffic"
  Jul 14 10:17:35 el98-src-c2cc-rpm-bootc-host2 systemd[1]: microshift.service: Main process exited, code=exited, status=1/FAILURE

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

after that the default kubeconfig I'm used from /var/lib/microshift/resources/kubeadmin/kubeconfig is no longer valid, I think this is also worth to mention

Comment thread docs/user/howto_c2cc.md

```bash
sudo rm /etc/microshift/config.d/50-c2cc.yaml
sudo systemctl restart microshift

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should we mention here that user should sudo microshift cleanup-data --all ?

@coderabbitai coderabbitai Bot removed the ready-for-human-review Indicates a PR has been reviewed by automated tools and is ready for human review label Jul 14, 2026
@agullon

agullon commented Jul 14, 2026

Copy link
Copy Markdown
Contributor

/lgtm

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Jul 14, 2026
@openshift-ci

openshift-ci Bot commented Jul 14, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: agullon, pmtk

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@agullon

agullon commented Jul 14, 2026

Copy link
Copy Markdown
Contributor

/verified by @agullon running exercising the steps manually

@openshift-ci-robot openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Jul 14, 2026
@openshift-ci-robot

Copy link
Copy Markdown

@agullon: This PR has been marked as verified by @agullon running exercising the steps manually.

Details

In response to this:

/verified by @agullon running exercising the steps manually

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci

openshift-ci Bot commented Jul 14, 2026

Copy link
Copy Markdown
Contributor

@pmtk: all tests passed!

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

@openshift-merge-bot
openshift-merge-bot Bot merged commit 25d93a1 into openshift:main Jul 14, 2026
13 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged. verified Signifies that the PR passed pre-merge verification criteria

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants